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

Change-Id: I672bc643f11c3ee1f1faa0971837189e046c200c