Merge "Revert "Add dexdiag_test""