Conflicts: cmake_targets/CMakeLists.txt openair1/SCHED/phy_mac_stub.c targets/RT/USER/lte-softmodem.c targets/RT/USER/lte-ue.c
