PIE: Restore "core" to pristine AOSP

Change-Id: I5578a2c5c27949c656181714933a420d3acb5fe3