Merge "Revert "Silence warnings in external/mesa3d""