Merge commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5' into gingerbread-plus-aosp * commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5': Add location shared library to core build.
Merge commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5' into gingerbread-plus-aosp * commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5': Add location shared library to core build.