Merge "Allow ogg files to be selected as ringtones" into oc-dev am: d44afb99c8
am: c8ae9d5a60

Change-Id: I878d4dce0113535d43b9cdc9fb7d230bb38082b7