Merge "Fix x86 build in app_process."