Android O MR1 IOT Release 1.0.7 (5157592)
Merge "Re-indent clatd code with clang-format"