Merge "make apex init .XXrc parsing honour .35rc even though we're not yet sdk=35" into main