Merge cm-10.1 into jb-4.2 cleaning up media files

Signed-off-by: travp624 <travp624@gmail.com>