[andrew_testing]: Merge pull request #1082 from andrew-bierman/fix/andoird-build

[andrew_testing]: Merge pull request #1082 from andrew-bierman/fix/andoird-build #49