Merge "Add cleanspec for renamed libdexfile_support test." am: c4df596561
am: 06798d8788

Change-Id: I0b1a2d98043ab6d9ae0851d109e452b200c9e828