Merge "Update TextureView.lockCanvas() test."