Move some utils to a more appropriate package/directory

Test: builds
Change-Id: Id0f0f89c34502deb6d0e50503e5534fcc51c3f9b
4 files changed
tree: 64d476884a00271edd9d64e8a17d7a82082b5faa
  1. tests/