am bbcc914b: am 01efd7e8: Merge "Use build_number from file"

* commit 'bbcc914b18a5b2ea57e25e6e79336c5c75d49421':
  Use build_number from file