Merge "Tuner JNI: descrambler" into rvc-dev am: c1f78e8c20

Change-Id: Ib0f52eab3337689e42c5a2df322aa204bd712aae