SystemUI: Make the HSPA+ drawables more consistent with the HSPA drawables

Though the older HSPA+ drawables are sharper, that makes them look
out of place in comparison with the HSPA drawables.

Change-Id: I76313ae0125b3a8fda928b240f33715e48f77867
Revert GPS changes for now until issues are resolved.

Will do a refactoring to better isolate this code.

Revert "GPS fixes"

This reverts commit 84c6741f03118168aa61f2e028efae2ea4953a9f.

Revert "Squashed commit of GPS changes from CodeAurora"

This reverts commit 669786140ea7579dcbe05eb2d5199ebf161239a1.

Change-Id: Ib1a55d1be8dbc933c690b2f06af206ab5511903c
Merge commit '4ab5ad84dff965422f796713841b3d21686fcc83' into jb2-PIE
Merge commit '130d87c5e1665488007409f467a595e57363ad9d' into jb2-PIE