Merge "Revert "Add dexdiag_test"" am: 7851a5339d
am: 1f45726a65

Change-Id: I26341c4422d42461be5e2e07e368dbfb805aa00f