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

Change-Id: I6b259336b1ecfa2564f4c2c2de9a5734a8666342