Merge "Remove Wifi APIs unused in AOSP."