Tweak to the libs.

Change-Id: I89857465ce2e337a1da54840e191c735312fb3cb