Merge "Use -Werror in external/libogg" am: 4d66072c93
am: 5e34e696f2

Change-Id: Ib4e51b9ecb309bd6b6de00195d8f3114b3331e6b