Merge "Revert "Add 'stubs' to libbinder_ndk"" am: b83144aac7
am: 3be6a37fff

Change-Id: I067f15a0c40bd06a9caea13be7dbe21b32fe02df