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

Change-Id: I171fb0337552841dfdcdd20ebb3e30bd55152390