Merge "Add opt/net/wifi/service to eclipse .classpath"