Merge "bullhead: move location/ to vendor" into nyc-mr1-dev am: f29de7cb50
am: dfa17b24b5

Change-Id: I45efa9351ab395b5d8952b215ba08d906dd7240d