Merge "Sometimes no audio output after playing some clips using Files.apk"
am: 80a288ad82

Change-Id: I1b051dba9d685a8d34232ca01c4283f17c6e8402