Revert "Reland "emulator: Disable the feature GLDMA.""

This reverts commit 0c765395.

Reason for revert: The roll in crrev.com/c/2333227c works fine on Marshmallow emulator.
For example https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-rel/747

Original change's description:
> Reland "emulator: Disable the feature GLDMA."
> 
> This is a reland of b7a9b68b
> plus increasing the default timeout to make sure emulator starts successfully.
> 
> Original change's description:
> > emulator: Disable the feature GLDMA.
> >
> > android emulator team points out that the exception is related to DMA.
> > Disable GLDMA temporarily to see if it can fix the timeout issue on MM
> >
> > Bug: 1093602
> > Change-Id: I940b8111db48d8b542b47f350b949dab7448d1d8
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2293279
> > Auto-Submit: Haiyang Pan <hypan@google.com>
> > Reviewed-by: Yuke Liao <liaoyuke@chromium.org>
> > Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#787433}
> 
> Bug: 1093602
> Change-Id: If4c1e60c0f45bd6c1e6be2444eafbf9b1550f209
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2295324
> Reviewed-by: Yuke Liao <liaoyuke@chromium.org>
> Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#787834}

TBR=liaoyuke@chromium.org,hypan@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1093602
Change-Id: I2d98ec9a6691bd71d074ff45f6191450424ba5cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2335401Reviewed-by: Haiyang Pan <hypan@google.com>
Reviewed-by: Yuke Liao <liaoyuke@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#794281}

build/android/pylib/local/emulator/avd.py

@@ -529,8 +529,6 @@ class _AvdInstance(object):
           '-report-console',
           'unix:%s' % socket_path,
           '-no-boot-anim',
-          # crbug.com/1093602: Disable GLDMA to see if it can fix timeout issue
-          '-feature', '-GLDMA',
       ]
 
       if read_only:

build/android/pylib/local/emulator/local_emulator_environment.py

@@ -68,9 +68,7 @@ class LocalEmulatorEnvironment(local_device_environment.LocalDeviceEnvironment):
 
       return timeout_retry.Run(
           impl,
-          # TODO(crbug.com/1093602): Temporarily increase the default timeout
-          # to make sure emulators can start successfully with GLDMA disabled.
-          timeout=120 if self._writable_system else 90,
+          timeout=120 if self._writable_system else 30,
           retries=2,
           args=[e],
           retry_if_func=retry_on_timeout)