Revert "Squash updates for MpDecision and Thermald from showp"

This reverts commit 0cd42768f6537330c307cffcf4e5b3de92561d4f.

Conflicts:
	arch/arm/mach-msm/msm_mpdecision.h

Change-Id: Ia135e003a8b6c77f43a5d48dfbde014bd1a82cac