msm8960-common:  Additional Cleanup

Change-Id: I1b5d060085f9714e83d1d397b26534854d44afbd