Merge "script update to preserve the spec dir structure"
am: a3dac536ba

Change-Id: I77f01cb41ea9fe139f2db608e082636cd413cf74