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

Change-Id: I863cb59a56c79895223b3a91ffde6bc00cad4025