Merge "Use const pointers where appropriate in dynamic_instrumentation_manager" into main