Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS." am: 4d9d191ee7 am: e79eae70f4
am: b847aeabd6

Change-Id: Ia3aa9abdfbb0f4860bed3b513b6cf4ebe852b747