Merge "Remove old api tracking files." am: a16582d48b
am: f9dca7a7d3

Change-Id: I221b6b84db7ea773a82f04909fd5cbb3b93217a5