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

Change-Id: Ida24a4e249b4dc55cf75f9f9b4b293be5d6c7033