Merge "Fix installd command line parser"