From: Dan Albert <danalbert@google.com>
Date: Fri, 9 Sep 2016 01:17:41 +0000 (+0000)
Subject: Merge changes Id513b72a,I92cd0116,I62393b58,I90ac2224,I527f88ac
X-Git-Tag: android-x86-8.1-r1~296^2~187^2^2~41
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=482dde3e03;p=android-x86%2Fbionic.git

Merge changes Id513b72a,I92cd0116,I62393b58,I90ac2224,I527f88ac
am: 572791e027

Change-Id: Ide3f10bab5d5789c0482cd55db974559c7f00366
---

482dde3e037728f5cbfd8b443c29252ceed454c0