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

Change-Id: I590693297c97c955d953ba7fac500210b2b7e2c0