Update sample building for devsite build