mokee phoneloc

Change-Id: I44cb0fd1949061694186639058ef49c2f06c1e6d

Conflicts:
	config/common.mk
update phoneloc data

Change-Id: I9652952d088312cc91fca218dcbaffcf42db0212