Fix dependencies of packages that target earlier releases
am: 6767e05934

Change-Id: I84712a036ee5e2b2eda093f6eda614acc34c4bba