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

Change-Id: I0e8a494d18705305abef6cbbe6b5a48167504b29