Merge "Fix dependencies of packages that target earlier releases" am: 8e49b42b6f am: ef26655bcf  -s ours am: b3d940136e  -s ours
am: 444ba7afdf  -s ours

Change-Id: Ie3c3b5b1b7d3c2b0870219d0c78c80cad3994b25