Merge "Use LOCAL_CLANG := false for GLES wrappers for now"