Merge "Add dexdiag_test"