Merge "Convert external/guava to Android.bp" am: 7e8dbb922b am: d137d8b461
am: 6a96182e00

Change-Id: I0b7d7ff96907c43d3173ad381e8e9b028e05477a