Merge pull request #5441 from lioncash/android MainAndroid: Resolve -Wmissing-variable-declarations warnings
