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

Change-Id: I6303cbddf16985f5d6bec134efe8d69ef2dff248