Merge "Split updatable/non-updatable Wifi APIs into separate directories"