Merge "Fix MediaStore_Video_MediaTest Again" into honeycomb