Back out e46601eb7279:533dc9ea3301 (bug 912322) for Android reftest bustage