Merge "Convert api-stubs, system-api-stubs, and test-api-stubs target"