am 91ca8952: Merge "Add media provider/scanner tests" into jb-dev

* commit '91ca8952dc3268183526c5192ee43eb0191ffda4':
  Add media provider/scanner tests