Merge "Fix dependencies of packages that target earlier releases"
am: 41e553f6ec

Change-Id: Iaeb2d75c4fb68074b15e725222eebcd73c63ed33