cherrypick 76bd108d from master. do not merge.

Change-Id: Ibb677f286b54a9dd593301a0f8b194d3b2dc58d1
SDK: update SDK to API 15
7 files changed