Android Build#6992

Shivansps wants to merge 2 commits into

scp-fs2open:masterscp-fs2open/fs2open.github.com:masterfrom

Shivansps:android-buildShivansps/fs2open.github.com:android-buildCopy head branch name to clipboard