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

Change-Id: I552ee1e0b8df66d95f4897b5b6663de6ffe0fc3b