Merge "Separate maps from code in oat file."