Merge "Changing sdc directory to unzipped_sdc_csar"