Revert "Revert "Track libcore""

This reverts commit 40e5282f190a6337f8c6b700b343c913f8db6b6e.