Merge "add .m2ts to video/mp2ts mimetype for Android" am: 8414aee176
am: 7543c2211f

Change-Id: I093c5b7b666817ad95f3a875ac7a48da1653d640