Merge "Add dexdiag_test"
am: b629050b19

Change-Id: I79d6f4d5dc8408d7a2aae8e7ce85db56302b1e64