Merge "Fix mini-debug-info generation for apps with wrap.sh script." into pi-dev