re apply Arch specific strcmp

Change-Id: I8dcbc8e380f88aa9b329f181e35322b4cb2e16ac