Merge "Fix build because of addition of new Radio API to VTS." am: 801f78cc05 am: c75e2f8d6b am: cde49bb624
am: f92167fbf4

Change-Id: Ied80223d77825eac6c18c55aafee26222eab4841