am: 3dd036dc99 Change-Id: I7385020f09ebcb876806cc82eca751c7f785c01c
3dd036dc99
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build reruns. Test: m -j32 Bug: b/70351683 Change-Id: Ic5fcd5def203de9c3022039fbdbaa866935301e8