am eb5ffc23: Merge change Id8e98194 into eclair

Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp

* commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c':
  Fix issues 2333450 and 2333559:
tree: d46c73d0233b2baecf3c1cccb24c86d8d51b6ed6
  1. cmds/
  2. include/
  3. media/