Merge "Add an extra level of indirection to make sure that native IHwBinder" am: b6dde12ef0 am: e7191f50b5
am: 0cf0b39360

Change-Id: Id47548cd4209bd7d4d0ede478fd5372d31c22a36