Merge "Use -Werror in frameworks/native/libs/vr"
am: 79ce1748ea

Change-Id: I46134a75bda74b212527ca4d0ffaa9dbc754ecee