Merge "clang: Allow LOCAL_CLANG exception for device/google/contexthub project" am: 138c7baabe
am: 800604dc37

Change-Id: I4de90e11061fb75ecc69456fd005a18bded20175