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

Change-Id: I1b6c95030aa96eacf7f4377b7b07847c482a6b9f