Updating to compile on Android again.