Merge "Revert "build: pass version and patch level to mkbootimg"" into nyc-dev