Merge "Tweak sgrep to add cc and aidl files." into lmp-dev