Change-Id: I8098f338602f90f9597f8cc7f703fb0b9459680f Test: m -j (Build will fail if there are references to the old name)