Merge "Use dlext_namespaces.h from the platform" into android12-dev