Fix arm32 check to work on armv8 32bit mode
authorChris Forbes <chrisforbes@google.com>
Fri, 1 Jun 2018 21:25:05 +0000 (14:25 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 21:25:05 +0000 (14:25 -0700)
am: add785f6ef

Change-Id: I919d43a00faec2dcf35996997efc613c31e570a5


Trivial merge