Fix dependencies of packages that target earlier releases
am: 7b2c6ed6a5

Change-Id: I82c88cdf42903770c7cbbc23e3f0b0394c833089