build librpc and remove unused NTP_SERVER
QCOM Legacy CAM Parameters flag
Revert "move media_*.xml files from msm7x30 and increase quality"

This reverts commit 58c3e055cec5f419d6290125f77978df7a1fc8c2.

Conflicts:

	device_ace.mk
remove media_* files as provided in commons
perms for advanced settings (although they don't pertain to the PrimoC)
Turn off ZRAM by default
Merge remote-tracking branch 'origin/cm-10.1' into jellybean-mr1