Merge "Fix ASAN builds after app_process change."
am: d21b6420d2

* commit 'd21b6420d2a321168547bee8885b50e598823255':
  Fix ASAN builds after app_process change.