Split radio and sap test modules
am: 7468fdf605  -s ours

Change-Id: I2d45d36c1a1a86f94024e667a46c4d2030232d9f