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

Change-Id: I31cdff0764abb146dc0d869bbfbeb7b0103d1de0