Merge "Refactor Tuner JNI and move the interaction with IDescrambler into DescramblerClient"