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

* commit '7732eb5bbad2c8f0c2ea850bcc97cf19d4a6bc58':
  Add blkid to all builds for use by vold.