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

* commit '65806a842b5b3475b4481325a56227492a4e063a':
  Move libraries for unit-tests to separate folder