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