Merge "Fix dependencies of packages that target earlier releases" am: a3efe60e6b am: 6387a14bfe am: 6087c3f339
am: a1ba486764

Change-Id: I167477f6b98edc81a45b3d74cde489415b70e9e0