Merge "Fix dependencies of packages that target earlier releases" into oc-dev-plus-aosp am: 94436731 am: 8d483e84 Change-Id: I57ef7c12b6ac2dd2e5442deffd03ab94904cc7fb