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

Change-Id: Ifa749d5f04dcb538c43e8ca9c31c64fbc9090ddb