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

Change-Id: Ide189e42132bf15b933899bdfeb45beb41d31afa