Merge "Exempt-From-Owner-Approval: rename .clang-format4 to .clang-format-4 to be consistent with stage-aosp-master" into qt-qpr1-dev-plus-aosp