Add back ART

Change-Id: Ic4be248cba0b454cfe669dfba15316b9c7316a2c