Merge \"init.rc: Remove cpu weight set on the root cgroup\" into nyc-mr1-dev
am: ac957cbd72

Change-Id: I00c942a5d3e283efe40541c12f7daac2d2c77770