Ensure we use the version.txt when available
am: 77846085c0

Change-Id: I93e0933edda125921e2d5986c468622ef9a81763
tree: 76ad207e89544866b936b3215b5afef2ae842313
  1. build/
  2. common/
  3. tools/
  4. OWNERS
  5. PREUPLOAD.cfg
  6. test_defs.sh