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

Change-Id: I1ed5ac527c56c685401ce126aa87610ed00f6d0e