Change recovery and system/media, CyanogenMod

Change-Id: I835eb461eb214307b83a4c3e1761d0c4265ef718