Merge "Add 'stubs' to libbinder_ndk"