Remove guava from Android bom
Remove Android support library
Merge branch 'android-updates'