eri: update from shamu

Change-Id: Ia9c52d8f55661cb92b78d76188462aaaa8e916f5
wifi: include hostapd_default.conf

Change-Id: If317d41de20b3e96307c826cf9e32feed30f1349
Merge "eri: update from shamu" into cm-12.0
Merge remote-tracking branch 'upstream/cm-12.0' into lollipop