Merge "Add cleanspec for renamed libdexfile_support test."