Cleanups in android docker image
Rename 'android' docker image back to 'ubuntu' and move Android NDK to /opt. See commit messages for more details.
Rename 'android' docker image back to 'ubuntu' and move Android NDK to /opt. See commit messages for more details.