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

Change-Id: I766089f3b932138c48e22bea3e170071a95b9cbf