Revert "Removal of legacy zbin_extra / zbin_oq_value."

This reverts commit e9b586e21bb899e247346e82bccf5afb42604910.

Change-Id: I5b36e6727da6c05278d97e2c37b80c109f79bed4
13 files changed