am ae22e37: AI 148127: CTS: fix \'unable to find instrumentation info\' bu

Merge commit 'ae22e3755448dcd84e4afae13ef6a1d525220946' into donut

* commit 'ae22e3755448dcd84e4afae13ef6a1d525220946':
  AI 148127: CTS: fix 'unable to find instrumentation info' bug in hardware package
tree: 2671cabe09b8a0045a60fab1a01a1e54086710eb
  1. tests/
  2. tools/
  3. Android.mk