Merge "app_process: use LOCAL_MULTILIB := both"