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

* commit '9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31':
  /vendor is sometimes on a separate partition now.