Fix build with system glm once again

Change-Id: I7cd179f6f981455cfece1ca8ce0ea314ac341f99