Merge "Fully disable clang format where needed." am: ce11673cad am: 8b747ff28d

Change-Id: I2ace249890826a1439ed6d4f9cf1a349f37c37e9