Android O MR1 Preview 1
Fix dependencies of packages that target earlier releases am: ffc5f72f39
am: 1980ffb6a1

Change-Id: I7a0fa1d68711077d46198eb94d0b79602e43d911