Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8 am: c44dd5a8 -s ours am: dec3c3d0 -s ours Change-Id: Ief9ddd7f24e1b921e9905cc334780e45b9f67218