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

* commit '5d7cd375e853aca670d01d92308f178145e0d0e8':
  Use FileMap from libcutil instead of rolling our own.