Merge "Refactor radio folder for 1.0 and 1.1" am: bf758ce382  -s ours am: e4124a3943  -s ours
am: 27ef401b97  -s ours

Change-Id: Ie3bf0530d32d043414e72470d3020f1f8304e176