Merge "AHB: add AHardwareBuffer_getId API in ndk"