am 716950a0: am a154856e: Merge "Fix MediaStore_Video_MediaTest Again" into honeycomb

* commit '716950a0c4d3fb65cf15bc85ed2dc6d4a275957b':
  Fix MediaStore_Video_MediaTest Again