Fixes build errors with MSVC 2015 BUG=aomedia:500 Change-Id: I8a18a114b14014ea8510e9b2f9dbe542cbac2dd5