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

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