replay CL 19916 and CL 19913 now that the build can handle them

TBR=r
OCL=19924
CL=19934
15 files changed
tree: 34e2a5396894dca1141c0db81df5d7791807a8d8
  1. doc/
  2. include/
  3. lib/
  4. pkg/
  5. src/
  6. test/
  7. usr/