Merge "Remove Foreground Boost CPUSet" am: bc86535529
am: 7c771fdfbd

Change-Id: I149bc1679ad8560192139ef8645be27417039038