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

Change-Id: Iade2d2d39db3e90c88990f9fde0d961bc1fd0f2b