Merge "Add an extra level of indirection to make sure that native IHwBinder" am: b6dde12e am: e7191f50 am: 0cf0b393 Change-Id: Id47548cd4209bd7d4d0ede478fd5372d31c22a36