Merge "Fix dependencies of packages that target earlier releases" am: 41e553f6ec
am: c9458971f4  -s ours

Change-Id: I607713f4bf2381b8b601cc289f2b0b21b2068932