Merge "Stagefright: idle OMX after ANW errors" into ics-mr0