Android O IOT Preview 7 (4635859)
Merge "Remove clang: true"