Fix sdfabric-1.0 branch build

Change-Id: Ia79016809debe3b8b9f8f226dd4d8896d07dcffe
6 files changed