Merge "Fix dependencies of packages that target earlier releases" am: 133b4fb575 am: b1111ca7a7 am: 9c4e2ffaf6
am: 2817a5f969

Change-Id: If97cbf7e6f7a980d39706b5f31b29b2d7cf2140f