Modify for building OctOS

Change-Id: Ib1b4901b59760ca921e0cd8a2e023294c59cc10e