Merge "Remove the api directory, which is not part of the public platform-tools"