am c3041432: am de846ac6: Merge "Change to new binder implementation for OBB" into gingerbread

Merge commit 'c30414329c381afba7bd23bdd0f1237fad0850a6'

* commit 'c30414329c381afba7bd23bdd0f1237fad0850a6':
  Change to new binder implementation for OBB