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

Change-Id: I31962c0a5b35162ed61e25d2d1873ade9f7e24ee