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

Change-Id: I4d913880a2d7e3ce91036679c977f8038fa191fc