Merge "Add dexdiag tool to images" into oc-dev