Merge "Make apex availability of liblzma explicit" into main