Merge "Restore end of dex2oat logging"