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

Change-Id: I35601ea85ab1afdd254ecc0ba1ac1b3c2094bba2