Merge "add .m2ts to video/mp2ts mimetype for Android"