am a154856e: Merge "Fix MediaStore_Video_MediaTest Again" into honeycomb

* commit 'a154856e0bc5ddeb8070737bb2f7464bbb79d3f0':
  Fix MediaStore_Video_MediaTest Again