Fix some manifests and re-track repository

Fix error for branch and re-track Contact(Slim->AOSP)