am 3367df34: am 2f85f654: Merge "Add location shared library to core build." into gingerbread

Merge commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444'

* commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444':
  Add location shared library to core build.