Patch for r171.
I hope this fixes the bug where my app is constantly freezing after a few minutes on Android. :)