Merge "Revert "Use clang for libhwui"" into mnc-dr-dev