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
tree: a54f4e7df9f004f79abb683ac586ce1a4f63f6d6
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE