Merge lib branch into lib dir

Using subtree merging we merge the lib branch, which contatins trimmed
down version of the full lib tree, into the lib dir. The command is:

git read-tree --prefix=lib/ -u lib

Subsequent merges are done with the following command:

git merge --squash --strategy subtree --no-commit lib
Pull in changes from lib branch