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

Change-Id: Ie6549560c815fb1ee03ff9ec51f27b30f5087cf9