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

Change-Id: I2472cd30b337e2f5ee79db761cf33a3e67a6339a