Merge "Add dexdiag_test" am: 05a252b52b
am: 85fcad5e6d

Change-Id: Id85962e4595c70ba09d48ff1d488df0504ed25ec