Merge "Fix dependencies of packages that target earlier releases"
am: bde4c9a8df

Change-Id: I24ee27f2d99de7cee6aace00b3d721cd91fff3d4