tree 75cc3e5516bcbf82d5cbc0881d4217a66c05e21a
parent 37716f6c81b19897b6fe866a0cdc068eced85c79
parent 65e4751633c93a4dd897ab8427f9b8af7a99b301
author Josh Gao <jmgao@google.com> 1532044217 -0700
committer android-build-merger <android-build-merger@google.com> 1532044217 -0700

Merge changes from topic "bionic_fdsan"
am: 65e4751633

Change-Id: I4b25c5bef4d2133416ba699b10b48981994e42cf