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

Change-Id: I7db3974890b83d157723c14ead7c58932827a55a