am 53619434: Merge "Add blkid to all builds for use by vold." into klp-dev

* commit '53619434ed56043841256dfb2074662dbd0acc5e':
  Add blkid to all builds for use by vold.