try again to merge msm7x27-common thunderc variations to allow use of aav6 default msm7x27-common

Change-Id: I0e6636842c3553781ceae0f52a2f13730f9a182c