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

Change-Id: Icf416351b4d74560d0b58069a24ea29495ab3000