Merge "Revert "Revert "Add 'stubs' to libbinder_ndk""" am: c8aaa44de4 am: 24b5c36cff
am: 5247447d0a

Change-Id: Ibbd4b39b4283f0e340053ef571a54cfa21b116db