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

Change-Id: I3ed6301554b766c303e57f11320d9c386d4a873a