Merge "Fixes to mem_map wraparound and ARM64 quick_invoke assembly"