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

Change-Id: I688641c856d982f54ffc760cb3a3fe14a2e947d1