Merge "Fix host-only exception in art test 005-annotations."
am: a9c9e85ea1

Change-Id: If3444ee406e3b430e173e12b289d0b312e31819a