am ad3f86a5: Merge "Fixed x86 GCC 4.6 compilation error about unused variable"

* commit 'ad3f86a526c49ecd733564771b5c2ce7eade2a96':
  Fixed x86 GCC 4.6 compilation error about unused variable