Merge "Adding optional 3.0 lock support to GraphicBuffer"