Merge "OtaDexopt: Add version support" into oc-dev