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

Change-Id: I55ed73815587aa773686ad60e4fda3bd65e8d032