Merge "Adds new HardwareBuffer plane-locking functions to NDK" into qt-dev