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

Change-Id: Icbeda570fbe2b80e91fbb8100b57f79ca0faa963