Clean up.

- rename some functions.
- remove trailing whitespace.
Go to the Android directory and build.
Make sure that the root directory is invalid.
Clean up.
Merge branch 'feature-build-anywhere' into develop