Merge "libbinder_ndk: mv include_{apex,platform}" am: d3138a4e34
am: 48475bf531

Change-Id: I937e96d802d628b5da6c620ead13285df2472adb