am a318515c: Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1

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