am 8e39c18f: Merge "Handle multiarch libgl-mesa-dev on Ubuntu 12.04"

* commit '8e39c18f3ba3ffeeb3217b545c9b14c5c9e977c9':
  Handle multiarch libgl-mesa-dev on Ubuntu 12.04