Merge commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d' into eclair-mr2-plus-aosp * commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d': Reimplement the OMX backend for stagefright.
Merge commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d' into eclair-mr2-plus-aosp * commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d': Reimplement the OMX backend for stagefright.