Partially revert "aokp: World Phone Support"

This partially revert commit 004201398671ebfdc77d10b9f06afe99f09a6fda

We need to keep the gsm.mk & cdma.mk to specify the
telefon type.

This fixes the 2G toggle not being visible after boot.

Change-Id: I9ba358a580043c587c16f10c83517f56d9693c13
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Include mGerrit as prebuilt apk

Patch Set 2: update mGerrit version

Breaks mGerrit's dependancy on AOKP updates for it own updates. Because
the apk is signed with the market key then the PlayStore will handle
the updates.

Change-Id: I6c86991062e0c95a9a783320e89a2cf6d0169047