Backport AHB test changes from Khronos review
authorChris Forbes <chrisforbes@google.com>
Mon, 14 May 2018 18:28:02 +0000 (11:28 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 May 2018 18:28:02 +0000 (11:28 -0700)
am: 9829d36b5a

Change-Id: I82459631b0ec75918e47b7609669100059e41a61


Trivial merge