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

Change-Id: I1bb99bebeb4f1b27849f827e0a9a3f51d0eda2ec