am 9602d9ad: Fix issue #2325782 Missing location features

Merge commit '9602d9adf456410a5bfc4268f55adc1b7ab0efa8' into eclair-plus-aosp

* commit '9602d9adf456410a5bfc4268f55adc1b7ab0efa8':
  Fix issue #2325782 Missing location features