Fix dependencies of packages that target earlier releases am: 0e0082535d
am: 8240a88ba4

Change-Id: Ice62d2458e2dc88378dee0f033e4b79b76074e05