Upgrade libraries

Change-Id: I9e99e01b5de45accadf4e122487cec51c6ba72bc