Merge "Convert api-stubs, system-api-stubs, and test-api-stubs target" am: baa37dbbad
am: 5a4b586e28

Change-Id: I880168e468e06a0351ad9e084e108cd46f8ca1d3