Failures on armv7 bots. Bug: 62356545 This reverts commit c8a8a56d. Change-Id: I62adc6ee6536f4c567825bd92424d4b2b72ec9be