Merge "Include CompanionDeviceManager in build/make/target/product/core.mk"