Fix m7-common (HTC One devices)