Use r22 and 18 build tools