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

Change-Id: Ic66b3e34c4cf95153896770b13864e1bf887ecc4