Merge "Build guava with core_current"
am: a0e05072ad

Change-Id: I18e9c4d0920206bbc4fcc02cdce0c4128123b0a6