Merge "Silence warnings in external/mesa3d"
am: 1fa9a39092

Change-Id: I457f04148cd137d1317932bd44bf6295c1bc477e