Merge "Don't delete new dalvik-cache for otapreopt"