Merge "Build stub libraries with smaller deps"