tree 0182e36b35510fbf7ece0f9fcb74c3939707cd32
parent 2a5d7adcfca48605a5ca73c1c969d023b21af242
parent f292c6262f6ad35eb3cf851fec1a3c369b70ce01
author Mitch Phillips <mitchphillips@outlook.com> 1566419691 -0700
committer android-build-merger <android-build-merger@google.com> 1566419691 -0700

Attempt to fix test failure for armv8.
am: f292c6262f

Change-Id: I8f7588450519ce5a0532f88e652a8d300925c902