Merge "Fix dependencies of packages that target earlier releases"
am: 133b4fb575

Change-Id: Ic174ca52983620f3aaae0b9855c8c880cbe081b4
tree: ca958d8f0168cfd2529894536de51d80828da37b
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml