Merge "Revert "Move util classes to their destination package""
tree: 691336431a8d66479eb3706661d72a9e0a16b5e6
  1. staticlibs/