Merge commit \'ddfe7bd8b89673473f77f927c3464e7de0d83baf\' into mnc-dr2-dev-plus-aosp
am: 54a8670716

* commit '54a8670716e9ea862ac633ef55db457f255ccf33':
  Set cpuset from surfaceflinger.