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

Change-Id: Id0848abc7a0b3f6e8c9ea72b396331c33d7ad803