am 29576ae8: Merge "/vendor is sometimes on a separate partition now."

* commit '29576ae8901eb95d4c8a34f242a282b2fb73d35f':
  /vendor is sometimes on a separate partition now.