Merge "stagefright: use small timeout for input buffer in SimpleDecodingSource" into nyc-dev