Merge "Makes some ART gtests more robust to a non-standard environment." am: 1f28be6f am: 0fcd1bda am: 9d586a70 Change-Id: I9a107aa69ce7aa3fc007a921128874f7c405fb7e