Merge "Fix ASAN builds after app_process change."