Merge "update builder script and how-to-use-docs"