am 841ef3bd: am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."

* commit '841ef3bd2081a74bf95be83211e92a653df61541':
  Use FileMap from libcutil instead of rolling our own.