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

Change-Id: If9c376697a638523f6b691fa37d9cfb73fc8e20d