Allow environment variable AVD to override android_avd setting (necessary for backwards compatibility)
Documentation formatting, cleanup