Merge "Add an extra level of indirection to make sure that native IHwBinder" into oc-dr1-dev
am: 38028ec63a

Change-Id: I8e4fb176e45b10579aceddbfc75ddac3382fae90