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

Change-Id: I14389c3525e03da01922450621a5a90610967430