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

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

Change-Id: I8a2d1327f5565f8e969b8bcc7607e5d07f470e98