Merge "Remove duplicate MediaStore class" into rvc-dev am: 776c21cbc3 am: 7edb151ff4

Change-Id: I1fc40a7922e45abe6afe5502e656fca362a9f467