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

Change-Id: I6fb06981c799090ed5bdeca8e75663b060422fbc