Merge "Revert "Add dexdiag_test"" am: 7851a5339d am: 1f45726a65 am: 759fa6f6f1
am: 2d7012d110

Change-Id: I859ad6a833bf6fd200fa1661af3b3f72c69c7456