Merge "Don't crash system_server if fixupAppDir() fails." into rvc-dev