am f5fe3949: Fix issue 2459650.

Merge commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b' into eclair-plus-aosp

* commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b':
  Fix issue 2459650.
tree: 0d109f511ed768747a529bb75a772e9be604ba9e
  1. cmds/
  2. include/
  3. media/