Revert "switch system/core to caf branch"

This reverts commit 7d511fb6124da2ddafdb3ce5e25ae580eaee816e.
track my own Nfc app