Merge "Fix dependencies of packages that target earlier releases" am: d52445dedc am: 984a1233a0
am: 596c94a907

Change-Id: Ic2da15a4bcf21e0010fb39585f5f9aa19f1788c2