[automerger skipped] Merge "Adds new HardwareBuffer plane-locking functions to NDK" into qt-dev am: 186800de6a am: 44c58c2daa -s ours
am: 381e27717a -s ours
am skip reason: change_id I8b97cdf8e7348e0c00f4ec62cbeb471ea4e00795 with SHA1 75a0a91c40 is in history

Change-Id: Ieb7086a84532bca01a6f3c0983f6a9b9f233d5aa