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

Change-Id: Icca8a42d838161bbba84dd87674185c69f60f03c