media: Fix issues when building with Clang

 * Pulled in from Google's fork

Change-Id: If1a690ac7a2c254afe444b617439ba9e893c2502
5 files changed