Merge changes from topic "libc++abi"
am: 2c2e007276

Change-Id: I488c2faf243a15c7ff64b796fac3fddf397dd521