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

Change-Id: Icb9344ee58c02a18a752d02d5265c49665016ac7