Merge "Revert "mkbootimg: add version and patch level"" into nyc-dev