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

Change-Id: Idd2dda474816e49fcc7fa28ead17577d40e73a0f