Importing my annotation lib changes.
Add static fixed libcfi version
Add hacked up epub cfi