Revert "Track addition of core-simple"

This reverts commit d5d5894f9109e3588124013e6242ffd066f46a32.

Bug: 119301609
Test: build
Change-Id: I5c833173101bd36cc657c761382d008896dcca73
2 files changed