Add network location packages

Change-Id: I487d82a360e41600230c35e01393aff5b16adc28

Conflicts:
	encore.mk