Merge "Don't crash system_server if fixupAppDir() fails." into rvc-dev am: c8a208f5 am: 8bf6bf75 Change-Id: I9a0eb38837185c3c7b7a6d0f1e208c1db51818c0