Merge "Fix MtpDatabaseTest#testFormatCodeForMpeg."