Fixing the library and a project update.

Change-Id: Ie3d134b9c79d8bf1a1877b23f8205612ebeb193f