Merge "Revert "zeppelin: cyanogen_zeppelin.mk: sysctl.conf is not being copied"" into gingerbread