more msm8974 consolidation

Change-Id: I1e6bd6cae183670ef20f95d832911eca85b55dbf