Unbreak merge failures

Change-Id: Ifc0141f1d594e1f5e04ee8532c985e6b3d480fb3
Fix build
Revert "Revert "Add support for Samsung extended AGPS""

This reverts commit 3e99bab16abb0ba4682ef7040e0e5702638b026b.
Fix build again
test
test2
test3