Merge "Improve CtsApiCoverage error message for missing testApk files" am: 4d6b7740b9
am: 25a7f03ae9

Change-Id: Ia3c2831758d3b5f7a392691bd6479d90162e51a6