Merge "Reland: Silence warnings in external/mesa3d"
am: 155c3e3e6e

Change-Id: I7eb2e98430b4d2ea5360db9bf4ba65a436884e75