DO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused. am: 72feab63b5  -s ours am: 76945790ac  -s ours am: 36dc8cd573  -s ours am: cab827ee4b  -s ours am: eb1c0658e4  -s ours
am: 8e7084533c  -s ours

Change-Id: I39f9d295a11179a7be4a2201b2633ae040170319