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

Change-Id: I422522708d14415593ad50f9c3c106bd5b9d2b7f