Library Sample, version 2.0 clean up.

Change-Id: I04dc83d9ec3d38836d4443f89af9318a4be7256b