am afbbce3f: Merge "Add library test makefile solutions."

* commit 'afbbce3ff1d2d94e54f48d748d18796ce671fce9':
  Add library test makefile solutions.