tree 0182e36b35510fbf7ece0f9fcb74c3939707cd32
parent 0063132ab9c093dde33e563f59232f9d6686770f
parent d4a475f9b3e6db20bf158e8fe3aa34979c4a1036
author Mitch Phillips <mitchphillips@outlook.com> 1566420769 -0700
committer android-build-merger <android-build-merger@google.com> 1566420769 -0700

Attempt to fix test failure for armv8. am: f292c6262f
am: d4a475f9b3

Change-Id: Ia11abf8cb3017907db39c1fc494f54cabcd2ffa5