Merge "NEW_API: Add getTimestamp() to SurfaceTexture."