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

Change-Id: I39e54ed8fb4fe8667df40b094c2dff4cdb20df18