Merge "radio@1.5: update makefiles"