Move some utils to a more appropriate package/directory

Test: builds
Merged-In: Id0f0f89c34502deb6d0e50503e5534fcc51c3f9b
Change-Id: Id0f0f89c34502deb6d0e50503e5534fcc51c3f9b
4 files changed
tree: 26f77ff1b1e6e367ac4a40ca8f8eb9b862e522f3
  1. tests/