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

Change-Id: I88b038ff76f2bf96a171f50e14d86bc6eabe6779