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

Change-Id: I6fdd969d776914155986d3eea7e56011a67a5984