Merge "ART: Remove workaround for bug 34659969."
am: 3e6c139973

Change-Id: I8548acf6a27379059411b832d73ab5d66dcea7cc