Merge "Build guava with core_current" am: a0e05072ad
am: 9f989a155e

Change-Id: I684f1e9e91f4d02fa4b5603099084fb1fb993020