Fix disassembly by adding back some deleted lines.

When importing for r309309, as part of conflict resolution, too much extra was
removed, resulting in bad disassembly for branches. Correct this.

Also re-apply the 0->NULL change from r298052.

X-MFC-With: r309309