Remove library

Change-Id: Ibb5a9ad2f93bb840f27e96c8bb44e454c38b709a
Add library fix

Change-Id: Ifa868cdce004f5656639fa009702f9972067bd56