am c4295d9b: am 810ff696: Merge "Cleanup fs_getline from fs_mgr"

* commit 'c4295d9b72812afbaebd7f2512c7a5bba9e7d5fa':
  Cleanup fs_getline from fs_mgr