Merge "Fix dex2oat usage error"