Merge "RESTRICT AUTOMERGE Ignore weak symbol difference in libc++ ABI check am: ddcf30d384 am: 76927ad594" into tm-d1-dev-plus-aosp