Update Guava to 16.0.1 for CDI compatibility

Bug: issue 8590
Change-Id: Ic12978ffdfe549d2100c0c6948b1864fb051200b
Merge changes from 062daa89de0e454576818c667d2c30ecc7e3f04e

062daa8 Update Guava to 16.0.1 for CDI compatibility

Change-Id: I2cd77ed0aa5493dd351e4014a8fd295f898b77c8