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

Change-Id: Iff5ce73998d6509c1e084cfa676faa67f456d896