Merge "Update ART tests to handle new System.gc behavior"