Merge "Revert "Include apks and jars in cts coverage"" into kitkat-cts-dev am: 130bc52f8d
am: ed72577282

* commit 'ed725772825f7153338ed2813257b7a4847d6c6a':
  Revert "Include apks and jars in cts coverage"