Merge "Fix tuner JNI breakage due to recent changes" into rvc-dev am: 92b1b302a9

Change-Id: Ic83f9ac032f1394639674dbfc480d0081aa82300