Merge "stagefright: limit software renderer for actual OMX components" into pi-dev am: 46ba387b02
am: a4afbde8f7

Change-Id: I48f4c7d1076497ca585fc3c1f61ebed0dff6e525