--- lxc-android-config.conf	2016-04-27 14:48:42.000000000 +0200
+++ lxc-android-config.conf.new	2016-04-27 14:48:27.000000000 +0200
@@ -4,19 +4,25 @@
 
 description	"lxc android config and container initialization"
 
-start on cgmanager-ready
+start on started cgroup-lite
 stop on runlevel [06]
 
 emits android
 
 console none
 
+pre-start script
+    if [ ! -d /sys/fs/cgroup/systemd ]; then
+        mkdir -p /sys/fs/cgroup/systemd
+        mount -t cgroup cgroup /sys/fs/cgroup/systemd -o name=systemd
+    fi
+end script
+
 exec lxc-start -n android -F -- /init
 
 post-start script
     if [ ! -d /dev/cpuctl ] && [ -d /sys/fs/cgroup/cpu ]; then
-        mkdir /dev/cpuctl
-        mount -t cgroup -o cpu none /sys/fs/cgroup/cpu
+        ln -s /sys/fs/cgroup/cpu /dev/cpuctl
     fi
 
     lxc-wait -n android -s RUNNING -t 30
@@ -42,3 +48,4 @@
 end script
 
 pre-stop exec lxc-stop -n android -k
+