Use system_image_dir if no custom locations were supplied.

This change allows `cf` to use system_image_dir to search for all required files
if user did not specify these files manually. In effect we can now drop the
redundant start_cf script that essentially supplied these same arguments to binary.

Change-Id: Ieb0cd403d5d8a6967d69dd66ee9ffc6ccbe9a6a6
(cherry picked from commit 623b1d38e30a9e804f6fa95daf9a0cae1a489948)
2 files changed