Fix dependencies of packages that target earlier releases
am: ffc5f72f39

Change-Id: Ibe073c0b408c8ddf5117a23b388d5b6ee151165d