Merge "MIPS: Refactor code for unresolved field entrypoint."