Merge "Use -Werror in frameworks/native/services/vr" am: 16a3e16346
am: f3a33324d9

Change-Id: I2a7305fbcc31f650cb8584686aa49439f5cfd123