tree 5c0f8742d17baa66596860f88bfe387020b2d864
parent b4a71637e2cdf76fbb843c9cb828fe9602e06d45
parent 9938cdeee87b06dfc890f3a62596f13724e201c3
author Dan Willemsen <dwillemsen@google.com> 1505955254 +0000
committer android-build-merger <android-build-merger@google.com> 1505955254 +0000

Merge changes from topic "host_bionic" am: 6e6e1abb89
am: 9938cdeee8

Change-Id: I8b8d1636ed5315a6fe44e7f3531542d7c6dd7b6a