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

Change-Id: I0a9444855d9ec00fba919d9812a373a3f468d23a