Merge "Let blkio cgroup follow sched_policy"
am: 2b73b60c66

Change-Id: Iedaab188d00a0df791ec5ea862608971af4321f7