Working on build script...

Change-Id: Ife98901c3ac0dacb5fde212e4fea393f7168d4ec