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

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