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

Change-Id: I9913687e8a9f2c418814e61e3922394bd4e6cdc8