Merge "Generate API XML files from android stub targets instead of text input."
am: 07603d63f6

Change-Id: Ib6afcfa98f28f31529c24acf1b2acbf19f328a9f