Merge pull request #2737 from sigmabeta/android-how-to Android: Improve build instructions, fix bugs in build scripts.
