Merge "Refactor Java GNSS HAL"