Fix potential conflict on arm devices

Test: trybots
Change-Id: I2dd24ea935882ef04f42e8c9b2719a758bda965d
2 files changed