Merge "Use -Werror in frameworks/native/libs/vr" am: 79ce1748ea
am: 397c7d31db

Change-Id: If99d869b0bd87a695c2683c676e06eaf02c9c847