Merge "Fix 2nd arch prefix application"