Split radio and sap test modules
am: 31de7a247c  -s ours

Change-Id: Ia4a1d7e040475545b5a14eacab53c359896ad2e2