Merge "Revert "framework.jar - include framework-wifi-stubs instead of framework-wifi""