Fix dependencies of packages that target earlier releases am: 7b2c6ed6a5
am: 37f70d2951

Change-Id: I439fd98863bd439008529193d0c6d7f2cba0f73e