Merge "Use -Werror in frameworks/native/libs/vr" am: 8ad1b2872d am: 37e64c30af am: 5e5014b84b
am: 300cf20369

Change-Id: I29776cd0895c14114f2a89d4158e0ebc389efe17