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

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