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

Change-Id: I40439da21424d88674ee6f806417d9b0dbae0299