Update libs from jf google edition

Change-Id: I53bc80fadeb3cf58f211a5db4311c6e18bdf6b6f