Merge "Updated Android build instructions to mention envsetup.sh and lunch."