Merge "Fix a logic error in `getDexoptNeeded`." into tm-dev