Merge "Revert "Add dexdiag_test""
am: 1cfe8728e0

Change-Id: I705ab54f2a7386373be5fbb469ca1e1dfde670fe