am 5f1b998d: Merge "Revert "Change getline to not count the null terminator""

* commit '5f1b998d9e41e712a0f3b6c9c929bfb48c9d1f7b':
  Revert "Change getline to not count the null terminator"