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

* commit 'a083ef9a7b882a249928ed928adf6af61a525e37':
  Use build_number from file