am a37d71d9: am 0ef4b4b5: am d6968024: Merge "Add opt/net/wifi/service to eclipse .classpath"

* commit 'a37d71d9e529755073d17cac6b8a8e342d681684':