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

Change-Id: I9b8dbfc908945fac05d90177c80f7cb52dc1ed74