am 54ee466c: am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1

* commit '54ee466c5389e0e9326258364a063e57e106ef5b':
  Move api.xml from tools/ to platform-tools/