ref: 9946ee23e0a4c158e26a505b162a072f81b8a3be
parent: 8ac3f9adaa25ab3f22dfbdc14e578a075afead53
author: Paul Wilkins <paulwilkins@google.com>
date: Fri Dec 19 10:02:58 EST 2014
Revert "Removal of legacy zbin_extra / zbin_oq_value." This reverts commit e9b586e21bb899e247346e82bccf5afb42604910. Change-Id: I5b36e6727da6c05278d97e2c37b80c109f79bed4