Merge "Add 'stubs' to libbinder_ndk" am: a5b8fd01ae am: b91160fcc3
am: edb669b843

Change-Id: I976e32678b5299a6b67b086617b4b91bf1be4ecf