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

Change-Id: I32bdc89d2281c3e3ca4949e0fde5ae0c3019f24d