Better Paranoid Android support

Closes #1880