Merge change 22526 into donut

* changes:
  CTS: Fix ContextWrapperTest to not reference hardcoded package names.
tree: 73901201630bb1ea43177221261f4f53f2b5fb2b
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk