Merge remote-tracking branch 'aosp/jb-mr1.1-release' into cm-10.1

Change-Id: I990ccbec1711dbbf82cffe209f064d6453ff43a9
Enable ARP offload

Change-Id: I15f363c691824b9e124102bfba2dd03b951d0fc1

Conflicts:
	WCNSS_qcom_cfg.ini
Revert "Updates for mr1.1"

This reverts commit 6c955a6ffe8da0ff024789a046bd303c2984d63b, we
can now go back to AOSP's HAL variants

Change-Id: I792eae47df3cca31900845f27eed6f8811440595
Revert "Enable ARP offload"

This reverts commit ba800d069ded3b4e3078da0712857fe27c319e7d.