Merge "Allow system_server to adjust cpuset for media.codec"