Merge "android.mime.types: canonicalize video/MP2T to lowercase."
am: 6aba3322c6

Change-Id: I032f51e812b68b00dccdb56a3e6e2f2710b780e9