Merge "Add option to use vendor version of mesa"
am: bf237028d8

Change-Id: I54f9bbdfb2df0182d714ed8b8e0bbe2ec41a1cb1