Remove AMM_VERSION 1240 ifdefs

Change-Id: I9fbaa828e58eccd615930b76a86d53aa19b83098
qcom_gps: Release lock when requesting XTRA data, oops.
qcom_gps: retry XTRA upload when the engine is busy
Merge remote-tracking branch 'flinny/cm-11.0' into cm-11.0