Updates to build with JB

Change-Id: I7c545cbb66efc22b9554de5cdfad5a85e4dfa972
qcom: gps: lbloc_api: LOG* to ALOG*

Cherry picked from http://review.evervolv.com/#/c/2097/

Change-Id: Icaf3f693e36338898a3a234a5659291faf96360e

Signed-off-by: busches <swbusche@gmail.com>
Merge remote-tracking branch 'upstream/jellybean' into HEAD

Conflicts:
	loc_api/libloc_api-rpc/Android.mk

Change-Id: Ic0ef2eab9dd0033f0c868818c912101c8e985d62