Merge "ART: Suppress a warning in run-test 912" am: a502c7202f
am: 36acfcc9c5

Change-Id: I8e369c08c90f2de8b93a346fb5fb48b0275665b2