Merge "Media API: Using context's classloader in MediaBrowser"