Merge changes from topic "presubmit-am-e960adc87698444e90ef00c961be22b6" into udc-dev-plus-aosp

* changes:
  Fix build for non-Lynx devices.
  [automerge] Fix build for non-Lynx devices. 2p: 19e09f99f8
  [automerge] Fix build for non-Lynx devices. 2p: 19e09f99f8 2p: be3822b7f9

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)