Merge "Move util classes to their destination package"
tree: 864b9711078d356678d983aea306fb7350728697
  1. staticlibs/