Merge "embedded.mk: +android.hidl.memory@1.0-service"