am e8f90ca6: am 570cd46d: Merge "Revert "Move libutils to libc++""

* commit 'e8f90ca60d65f5a0542b77f8f517c4fb80da2e52':
  Revert "Move libutils to libc++"