Merge "cgroups used by init must be mounted before any services start"
am: 63c15c1b11

Change-Id: I2d9298d6de7fbe3b1ad827f498822545e696d4cc