Merge "Revert "Include apks and jars in cts coverage"" into kitkat-cts-dev