Merge changes from topic "presubmit-am-e960adc87698444e90ef00c961be22b6" into udc-dev-plus-aosp am: 75b045731e am: fa8ae3d110 am: 26e757201c

Original change: undetermined

Change-Id: Id040f651ea77f25223cdabdfc38dbea4738b016f
Signed-off-by: Automerger Merge Worker <[email protected]>

self-extractors/google_devices/staging/Android.mk

@@ -18,10 +18,9 @@ LOCAL_PATH := $(call my-dir)
 
 ifneq ($(filter lynx,$(TARGET_DEVICE)),)
   $(call add-radio-file,bootloader.img)
+  $(call add-radio-file,radio.img)
 endif
 
-$(call add-radio-file-checked,radio.img,version-baseband)
-
 ifneq ($(filter lynx,$(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)