more msm8974 consolidation

Change-Id: Idd649ef203eaae3df8fe4c2ed74c6b2055d2e956