stagefright: httplive: Bring in line with upstream

 * Roll back pre-MR1 changes which are causing issues.

Revert "stagefright: httplive: Fix switching for HLS live use-cases"

This reverts commit 5188aa6f.

Revert "httplive: Resolve buffering standoff in HLS"

This reverts commit 0610341f.

Change-Id: Ia6bd40e2ff4ef06c790a85e3a33f2c46efa99c8e