Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8df am: c44dd5a879  -s ours am: dec3c3d02b  -s ours
am: da238095c9  -s ours

Change-Id: I4f8cf81dd24b1c21efb52a166eea70abd1dd8785