Merge "Separate file utilities from utils.cc"
am: ca4e101463

Change-Id: Icf36d4b97fe2728a84da75315e6162cae65f6752