Merge changes I7df1ff78,Ibc2e8adf into honeycomb

* changes:
  MediaScanner: Make sure name field is set for file based playlists
  MTP: Fix problem with MTP starting up on the first try.
tree: 7f17abfbd0b95e54e4e38037f5f41dc387633b1d
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE