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

Change-Id: I20df7b673927fb1dce0b044d40198402797a5938