- Moved some code into BoofCV's Android integration
- Updated code for that change
- Fixing merge
- Fixing minor issues