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

Change-Id: Id1676df0201b2e6cfba06361647a222b3bef9f85