Fix dependencies of packages that target earlier releases am: 6767e05934
am: 6736fb2967

Change-Id: Ie2bfb2e0c422e7a7e2f9cf96ba38e989d0c3c8a9