Merge "Switch mdsal-distcheck-oxygen to mvn35"