Fix dependencies of packages that target earlier releases
am: 7416628255

Change-Id: I12b7e209f7697fde8f3641796540fa8f6ce25be1