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

Change-Id: Ic22dfd17114332b551dfca0863b3fafc8924022e