Android: C89 cleanup to avoid warnings/errors since the default gcc mode on Android is still pre-C99.
2016-02-09T17:36:42