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

Change-Id: I800ec0cb800573a14eede979c743486cb19701d1