Android O MR1 Preview 1
Merge changes Ib4f6b1b4,Iac340c25

* changes:
  Workaround for outstanding LLVM assertions: Modify test cases.
  Fix some LLVM assertions and add workarounds for others.