Merge "Support GNSS HAL v2.1 in JNI"