Merge "Fix ART debug build boot."