From: Elliott Hughes <enh@google.com>
Date: Sat, 5 Dec 2015 00:02:27 +0000 (-0800)
Subject: Merge "Fix GCC build."
X-Git-Tag: android-x86-8.1-r1~1074^2~151
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=70d477c913;p=android-x86%2Fbionic.git

Merge "Fix GCC build."
am: ef2ba3dbf9

* commit 'ef2ba3dbf986257ded12531fe15bf0d1d4a87d50':
  Fix GCC build.
---

70d477c913981047235054b6bbb4faa5bfcafb8f