Bug fix: reorder flags in the demo Makefile
Move lib test app from lib dir to demo dir

The demo directory is a better fit as a home to the application that
demonstrates the library usage.
Merge branch 'update-demos'