Merge "Revert "Add CONFIG_CPUSETS and CONFIG_SCHED_TUNE (update prebuilt)""