Merge "Add dexdiag tool to images" into oc-dev
am: 953ff9f7d8

Change-Id: I9ae6a4a67f9f2b55593ae6a1b0c49485d8a99676