Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_opt_net_wifi into cm-12.0