[automerger skipped] Merge "Adds new HardwareBuffer plane-locking functions to...
[automerger skipped] Merge "Adds new HardwareBuffer plane-locking functions to NDK" into qt-dev am: 186800de am: e19e029d
am: 9de184a4 -s ours
am skip reason: change_id I8b97cdf8e7348e0c00f4ec62cbeb471ea4e00795 with SHA1 c5f7a3a6 is in history
Change-Id: Ibd64d079dbfdb4c2725a99614d030e3665721eab