Fix dependencies of packages that target earlier releases am: f831a344 am: 027410b6 -s ours am: 31b6019f -s ours am: f12ae090 -s ours Change-Id: I072962f1f2697e146b2652b166659fb5cee875ea