Merge "Remove arch check"