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

Change-Id: Id4068a720cb4404055d79dc1371873e4a11b235c