Merge "Fix the missing 2nd arch prefix."