Remove duplicate if statement

Change-Id: I7a9605815186d1dda79085bffa4250ee7497a5ed
manually patch location provider fix from this gerrit patch:

http://review.cyanogenmod.org/#/c/29349/

Change-Id: I3057018148020fac311d74e2099280eb63797257
Disable ScrollingCache (credit: blahb14hblah)

Change-Id: Ib67a26fca5ad5868c43781aa887089434dd615d2