Snap for 6571063 from 8c1bf36e to mainline-release

# $(9): module directory name

# Returns the a list of src:dest pairs to install the modules using copy-many-files.

define build-image-kernel-modules

  $(if $(9), \

    $(eval _dir := $(9)/), \

    $(eval _dir :=)) \

  $(foreach module,$(1), \

    $(eval _src := $(module)) \

    $(if $(8), \

      $(eval _src := $(8)/$(notdir $(module))) \

      $(eval $(call copy-and-strip-kernel-module,$(module),$(_src)))) \

    $(_src):$(2)/lib/modules/$(9)/$(notdir $(module))) \

    $(_src):$(2)/lib/modules/$(_dir)$(notdir $(module))) \

  $(eval $(call build-image-kernel-modules-depmod,$(1),$(3),$(4),$(5),$(6),$(7),$(2),$(9))) \

  $(4)/$(DEPMOD_STAGING_SUBDIR)/modules.dep:$(2)/lib/modules/$(9)/modules.dep \

  $(4)/$(DEPMOD_STAGING_SUBDIR)/modules.alias:$(2)/lib/modules/$(9)/modules.alias \

  $(4)/$(DEPMOD_STAGING_SUBDIR)/modules.softdep:$(2)/lib/modules/$(9)/modules.softdep \

  $(4)/$(DEPMOD_STAGING_SUBDIR)/$(6):$(2)/lib/modules/$(9)/$(6)

  $(4)/$(DEPMOD_STAGING_SUBDIR)/modules.dep:$(2)/lib/modules/$(_dir)modules.dep \

  $(4)/$(DEPMOD_STAGING_SUBDIR)/modules.alias:$(2)/lib/modules/$(_dir)modules.alias \

  $(4)/$(DEPMOD_STAGING_SUBDIR)/modules.softdep:$(2)/lib/modules/$(_dir)modules.softdep \

  $(4)/$(DEPMOD_STAGING_SUBDIR)/$(6):$(2)/lib/modules/$(_dir)$(6)

endef

# $(1): modules list

# Base modules and settings for the system partition.

PRODUCT_PACKAGES += \

    adbd_system_binaries \

    adbd_system_api \

    am \

    android.hidl.allocator@1.0-service \

    android.hidl.base-V1.0-java \