am c7845885: am 3393b3ae: (-s ours) am a318515c: Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1

* commit 'c784588597a9f620bc10da3e1c02ca2a8df021f6':
  Move platform 15 sdk rev to 2. do not merge.