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

Change-Id: I1d2eb7b3a21ef8b7f5772e8655de841c558c4ee3