Revert "Missed these"

This reverts commit 755f8e8111ccfff5ecbf13fa4fb0fb8b7a48da8e.
Revert "Remove mpdecision and thermald"

This reverts commit c0a8f159b077e2ac7491bd320e15322e0c593e4a.