am 1d2b4c02: Merge "Move libraries for unit-tests to separate folder"

* commit '1d2b4c022c419e1e85336fa44e644772eefb8b64':
  Move libraries for unit-tests to separate folder