update build system

Change-Id: I4643271f5ce588aa8a20623b679a49f88484174d