Merge "remove unused TcpTx/RxPackets java & jni constants" into main