This reverts commit e9b586e21b. Change-Id: I5b36e6727da6c05278d97e2c37b80c109f79bed4
e9b586e21b
zbin extra / zbin_oq_value was widely passed around, hence removal touches a lot of code. Change-Id: Idc94359735b60c38a160e4385ae09d5ca8b6b8e5
Also includes block error. (This patch is mostly cherry picked from commit db7192e0b0) Change-Id: Idef18f90b111a0d0c9546543d3347e551908fd78
db7192e0b0