Hopefully fixing phone connectivity
Merge branch 'LD-Lollipop' of https://github.com/Linuxdork/android_build into LD-Lollipop