am b1665953: am 623a5572: resolved conflicts for merge of 882ad42e to eclair-mr2
am b1665953: am 623a5572: resolved conflicts for merge of 882ad42e to eclair-mr2

Merge commit 'b16659533e55476bbe2c0b177943ef8f4129e34a'

* commit 'b16659533e55476bbe2c0b177943ef8f4129e34a':
  Add clean step for switching GPS API from pdapi to loc_api

RR-msm7x30/platform_manifest,Hybrid-Power/startsync,see4ri/lolili,xorware/android_build,hagar006/platform_manifest,xorware/android_build,fallouttester/platform_manifest,knone1/platform_manifest,xorware/android_build,xorware/android_build,xorware/android_build,ND-3500/platform_manifest,pranav01/platform_manifest