Merge changes I4710a554,I28c8188b,Ia8d4b546

* changes:
  Set MediaPlayer sources in more direct fashion.
  Grant ringtone picker the ability to see Music.
  Also include snapshot value in APK cache digest.