Fork for BNR work on Android support library.