4.2 temp hacks

Change-Id: I5cbbfb75f330a7ddef995fd966209a00ad9f1ef3
Revert "Change-Id: Ie2dcf87494c71d6da9493eddad8fe0a59ac5f0f9"

This reverts commit 1966e40a05a795cdfdfa6160468cdcb8e46dd619.
gps - Added support to delete aiding data test feature.

gps.h, added more data catagories, to now at the total of 21

Change-Id: I85dc22b405c18df87900acd3d03f899d1560cfc5