Merge "Add dexdiag_test" am: ad70f8f997
am: a2d4447e34

Change-Id: I773c7c41e25268a99445428d4cb3369dc66d70bb