Merge "Update 8064 memory map"