Merge changes I424ba760,Ic0826085

* changes:
  MTP: Implement extra object properties for audio, video and image files
  MediaStore: Add helper method to create Uri for querying genre for an audio file