Revert "Track addition of core-simple"
am: 7057548c48

Change-Id: I7b18fc37adbf2cfcd60f8af9a1b079ac72859447