Merge "add cpuset support to libcutils" into mnc-dev