[automerger skipped] Merge "Add an order-only dependency on the build number...
[automerger skipped] Merge "Add an order-only dependency on the build number file" into rvc-dev am: 741f4841 -s ours
am skip reason: Change-Id I1609a790dd4d0a03c8308b6e552622fe33fa2499 with SHA-1 da71eda2 is in history
Change-Id: I4b7e1903c65cd37ad1968e236d606eb44004ad3e