Merge "ISurfaceTexture does not have a method getIdentity()"