Merge "Fix braino in ART script." am: 57b96f5948
am: b701518f61

Change-Id: I454c99f878347df4ed0c19274332607b0d8f8f87