Merge "Fix dependencies of packages that target earlier releases" am: 8e49b42b6f am: ef26655bcf  -s ours
am: b3d940136e  -s ours

Change-Id: I39e54ed8fb4fe8667df40b094c2dff4cdb20df18
tree: b9bbc285430ffb5363a70eb27e382c38f5a85b7a
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE