Merge "Remove testdex version." am: e01c2851a1

Change-Id: I8cd24665bac677701d4146248fdbcf213a21bad8