Merge "[automerger skipped] Import platform SDK from build 5716442 am: 7984eb5059 -s ours am: 42f31fd711 -s ours
am: 68f4f60d1f -s ours
am skip reason: change_id I82a1283080c5d21fd20ae937616f537275fd6714 with SHA1 81a2e393ce is in history

Change-Id: Id4e245d1d577fadf9bb27417cdc55c9ab8030f8c