Squashed 'builder/' content from commit ddbe466

git-subtree-dir: builder
git-subtree-split: ddbe466d35f20815b99ef91f60127af2f8f351ff
Merge commit '7d0fa723eb2961f5934d8dfecb0fa2cd58b25027' as 'builder'
Squashed 'shlib/' content from commit 323394a

git-subtree-dir: shlib
git-subtree-split: 323394afac02cb0eea982fc7d90a2eefb00a8796
Merge commit 'ad46d419fda8a5ab781e970b263ff21ca09181ba' as 'shlib'