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

Change-Id: Ia872bcedde94c70dadc2c3a4e69e2d5cd375c28f