updateing

From d289004f35708eb794557dc7e20827d963bfe7bf Mon Sep 17 00:00:00 2001
From: Hamster Tian <haotia@gmail.com>
Date: Sun, 2 Oct 2016 23:15:03 +0800
Subject: [PATCH 1/4] Revert "stagefright: untangle metadata-mode handling"

This reverts commit 3e328782f1e1061d08ea0c45b855cc418a2d9ea6.

Conflicts:
	include/media/stagefright/SurfaceMediaSource.h