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

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