Fix dependencies of packages that target earlier releases
am: 37e9a28262

Change-Id: Ib8b9272423ba7513ea653843335fd1907970c40f