Merge "Remove duplicate MediaStore class" into rvc-dev am: 776c21cbc3 am: 47fae0e567

Change-Id: I7dec29a9df83f464c2b89f29fbc93bd6bd6d0a2c