Merge "Adds new HardwareBuffer plane-locking functions to NDK" into qt-dev
am: 186800de6a

Change-Id: I29d24caea0a66e3378d9950b3ef3160bf628768a