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

Change-Id: Ic6bf2c161a8027ec463272c0466566aa825bba3e