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

Change-Id: I9d1f953be99e1af655b18cc37e8368e5a7ce39ff