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

Change-Id: I5f95796017de8db8e862bd10c83ab174632f7b40