Revert "stagefright: provide a custom key to prefer adaptive playback"

This reverts commit 6844ed4ed1b72b552384da3e950bb8ba917ec086.

Conflicts:

	media/libstagefright/ACodec.cpp
fix merge derps