Merge remote-tracking branch 'aosp/jb-mr1-release' into mr1-staging
Update dependencies for CM-10.1

Change-Id: Ied992d087619e6086c968a614f69b6f719565780
toro: Remove unsupported network modes and set default

Remove network modes that are not supported by toro and
set the default network mode to LTE/CDMA.

Change-Id: I17a3c62e7d4fafe6626f9169bf197757e3e5c6d3
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	cm.dependencies

Change-Id: Iea1ae3486c7ba00061adce4d352c45372c6abc1b