Merge "Revert "Use -Werror in frameworks/native/libs/vr""