Merge "Build guava with core_current" am: a0e05072ad am: 9f989a155e am: a963f99f31 Change-Id: I01ff8bd46c740bc57f9e351df1684ee8c2b832a7