Merge "Fix include path in AHardwareBuffer" am: 50be49ca0b am: 75a2f6acb6 am: e2f84d355b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2498355

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