Merge "libbinder_ndk: rename things according to convention" am: 37465f9256
am: 58edc4c7bb

Change-Id: Ide1d4682a30fbc074ba65aa059430cdcd16b1e1f