rebase off M8N_s802_08232014N_for_M9N_1029

Signed-off-by: Brandon McAnsh <brandonm@matricom.net>
Update defconfig after rebase

Signed-off-by: Brandon McAnsh <brandonm@matricom.net>