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