Merge "brillo_config: pull PRODUCT_VERSION from cfgtree" am: fe2032e0c0
am: db6e740fbc

* commit 'db6e740fbceb69da0a7a8ee25e251918e8e36544':
  brillo_config: pull PRODUCT_VERSION from cfgtree