Merge "Move libdex off safe-iop."
am: 4c2a9d352f

Change-Id: Idb86b098a67b74a6adcdf461476147d8707251f8