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

Change-Id: I5091c213fec7ac05b5b061c50a0bcccae0752378