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

Change-Id: I3cd3dc96ececb90766cd9911fbb6c581631cd5af