am f9fb333: AI 148276: CTS: Remove internal API dependency from MediaSto

Merge commit 'f9fb33343ea97aaa019443f2f8eb2d7c5da10e10' into donut

* commit 'f9fb33343ea97aaa019443f2f8eb2d7c5da10e10':
  AI 148276: CTS: Remove internal API dependency from MediaStore tests
tree: 640e2d5e142c1449341f6f2e0131b8124e122925
  1. tests/
  2. tools/
  3. Android.mk