Merge "Revert "Use -Werror in frameworks/native/libs/vr"" am: a6d2f5571c am: 4276e8a1e7
am: 3975700384

Change-Id: I20cdc3eb77519a45cd15e96118e5c6db0e818adb