am 807a28b9: am 00bd658e: Merge "Remove obsolete libffi"

* commit '807a28b90eda138db0079e47f33cc7e081d7c106':
  Remove obsolete libffi