manifest: sync with CyanogenMod

Change-Id: Ia7da1fec62149af8db74d21975bbe9246fccfcd4