Merge "Revert "Use -Werror in frameworks/native/libs/vr"" am: a6d2f5571c am: 4276e8a1e7 am: 3975700384
am: d14ee8e15c

Change-Id: Iace2973a9efccb9e821284b701ee745a5727892d