Revert "rebase geeb (LG Optimus G)on mako this is not the geeb branch"

This reverts commit 90f97c07e88013d2869bd90289b86933aac108bb.