Merge "Fix dependencies of packages that target earlier releases" am: 30c85e8178 am: 577d18e542
am: fa27358374

Change-Id: I932c83068da414a84a9ffd7e8f6127608d4a7092