Merge "Revert "Add dexdiag_test"" am: 1cfe8728e0 am: 9206a9a087
am: 61b9bff2c7

Change-Id: Ie94fb959ddda25ad92cfb536aea7a1b1012961b0