Merge "Avoid accidentally using the host's native 'as' command." into cw-f-dev am: 4e07040287
am: 163fba7c39

Change-Id: I3fb49929381f163c4e027e9c11f88b89bdcd5cea