Merge "radio@1.5: update makefiles"
am: f581c60f08

Change-Id: I9160df2a80d3e05cde8c2bea5e1fb588b719ea81