Merge "Add low_4gb support to MapFile and MapFileAtAddress"