Merge "Add dexdiag tool to images" am: 2f4e8f46e4
am: b11e7370d7

Change-Id: Id8870fa93a1b99209c1edccbd099571b52c81058