Merge "Add .m4r to media scanner extensions" am: f3209f65de
am: c969804cad

Change-Id: Id3bca83c64cb57d97ece4aa818c7435062f914c4