Follow change to ART_TEST_LIST_*
am: 8307206011

Change-Id: I63c9cade3e7272b89a55c702d5008dbc1af80b2f