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

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