Fix dependencies of packages that target earlier releases
am: 0e0082535d

Change-Id: I2353e3caf51b8819b2071b712a1c823245549bb6