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

Change-Id: Ibfbf15ae829fd093fcc773d6bcb9fe4d8043c257