Merge "Handle multiarch libgl-mesa-dev on Ubuntu 12.04"