Merge "ANDROID: Build fix for hmac.c"