Revert install gpe-bootimg in favor of fstab swap at boot

Change-Id: Ie6701d3606ed017c4a8c03a5d40fd73c23655c0e
Merge branch 'cm-11.0' into kk_mkt