more msm8974 consolidation

Change-Id: I0c0bada4f6d35588fd087c720caad4e2183e08e5