Merge "Update Android's bundled mime.types mapping." into main