Resolving conflicts between qcom-common and msm8226-common by removing duplicates

Change-Id: I63e8378cdea4795725fbb7efc9cb7ec45e28f60a