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

Change-Id: I3e1a183097aa2a86c84b0c34f88c7db01f299679