Follow our own hardware/msm7k for aliasing reasons

Change-Id: I5e086655478b923cd9a74bc331ddf65bbbfcd979