Use kernel/google/msm - We don't need to track two copies

Change-Id: I97995a76187c937bbe6fb6443f7de91514965a4e