Merge "Add notifyPixelsChanged() call to NDK unlockPixels()."