Merge "Tuner JNI to use V1_1 ScanCallback"