Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp * commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a': Remove now unnecessary property overrides to opt into stagefright.
Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp * commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a': Remove now unnecessary property overrides to opt into stagefright.