d2cri: Updates from upstream.
Squashed commit of the following:

commit 80772ac9aa1f701c2187392041d87e965e190549
Merge: aa5e4c9 e55a0bd
Author: hedwig34 <hedwig34@gmail.com>
Date:   Sun Dec 1 17:57:47 2013 -0500

    Merge remote-tracking branch 'cm/cm-11.0' into kk4.4

    Conflicts:
    	tg.mk

commit e55a0bdd37e7bd383ae16c80b854788b981c18c5
Author: Dan Pasanen <dan.pasanen@gmail.com>
Date:   Mon Oct 28 21:28:03 2013 -0500

    d2cri: remove cdma.mk

    Change-Id: Ide9f34e76e331f779d4fac9a692b9a5815e6d48d

Change-Id: I2b80c2de8832e6079d956dd34654adc05b61e7be