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

Change-Id: I2f36138ca1ec970026da70c321144d80af68c81c