Merge "Otapreopt: Remove patchoat step"