Merge "Do not use pragma diagnostics as a workaround" am: 010d40bb2f am: 63d977a809 am: 3afade4d2e

Original change: https://android-review.googlesource.com/c/platform/external/harfbuzz_ng/+/1815036

Change-Id: Ic1cb6e68574b9bb0cd47321d3593583c422d0712