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

Change-Id: Ie95146abc1a8c899e8907c360bcf296a73a8c0d7