Merge "custom bootimage: Make spelling of variable match the commit in build/"