Merge "Revert "Add 'stubs' to libbinder_ndk""
am: b83144aac7

Change-Id: I30555b51fff21bc141ad0d305b7278b06c36f647