Include arm in check for special importer for arm arches.

Bug: 903709
Merge "Include arm in check for special importer for arm arches." into develop