Merge "Revert "OtaDexopt: Temporarily disable""