DO NOT MERGE: bullhead: move location/ to vendor
am: cb1e6e6fc7  -s ours

Change-Id: I28f643f17987792b0912923957ee1c95d776d816