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

Change-Id: Ie35abb4f546667a4e381d01031e848d997b45137