Merge "Do not check arch for format check."
am: 70a454e25b

Change-Id: I6104486dc24c9779efb14edbe073ea405c479508