nicki: Remove modem links, generate firmware symlinks

 * Because remounting the system partition to symlink firmware is dumb.

Change-Id: Ie967d972cb7f2c5538a0a682c4b06b10449dedd0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD