am a817ff9c: resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aosp

* commit 'a817ff9c':
  Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().
  Add basic Darwin support to libcorkscrew.