Merge "Add low_4gb support to MapFile and MapFileAtAddress" am: ff12923229
am: 9aa8913485

* commit '9aa8913485499b9c736addefe288ba5bd884d368':
  Add low_4gb support to MapFile and MapFileAtAddress