Merge "Revert "Add 'stubs' to libbinder_ndk""