Merge "omapi: Set min_sdk to 35" into main