Fix dependencies of packages that target earlier releases am: ffc5f72f39 am: 1980ffb6a1
am: 9180bc72bc

Change-Id: Id23a13594265b73d3cfd19e7cc5fe4a3e9ae19dd