Merge "Avoid accidentally using the host's native 'as' command." into cw-f-dev