Merge "Move api text files to android.txt/xml." am: bbe3a026cf am: 7d16e8e540
am: d80a44c322

Change-Id: Ia99141512483db6538e9af5dbf67c6ca1248ee01