Refactor radio folder for 1.0 and 1.1 am: 8735a7d935 am: 2576f3505f
am: 336a914eb3  -s ours

Change-Id: Ie4ae3057b3ec1cea9b54dd854efa44f30eb9c221