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

* commit '6d0899ea4735293cca61661366dd98917f200bb3':
  Add library test makefile solutions.