[automerger skipped] Merge "Add option to use vendor version of mesa" am: bf237028d8 am: 530328926c  -s ours
am: 3443c3788c  -s ours

Change-Id: I77921b8f0cd6ebe796edc3bb7c2614f1632c50a1