Merge "ANDROID: Build fix for hmac.c" am: 1710f81be4

Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/2115228

Change-Id: I6713401c3d010d63f9b469d8fc34a4f2e8a0bda0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>