Merge "Fix dependencies of packages that target earlier releases"
am: 8e49b42b6f

Change-Id: If33a227619c50e0d2b19dd3cc9f14e9d45ad5807