DO NOT MERGE: Revert "shamu: add location API"
am: 9be41289a6  -s ours

Change-Id: Idc3ea06b4caaebd2543b0569ab4608b5df278d79