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

Change-Id: I68633122a2e6fa9ded5c445bae84592e79333fa6