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

Change-Id: If3fca43c17da75f1464640a721ffd61d375506b5