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

Change-Id: I543eabe7db997a0cba87b250fbcd4566455351a7