Fix dependencies of packages that target earlier releases am: ffc5f72f am: 1980ffb6 am: 9180bc72 am: ce986657 Change-Id: Ia4acb03cec2baf0c79815194b747047327f4c8ba