fix incorrect MSM_ION_HEAP_NUM. (Causes ION_HEAP_CREATE: Invalid heap
type error during boot sequence)
fix more Don't call enable on unprepared clocks errors
Merge branch 'kk_chocolate_rmfx' into kk_elite