Merge "Add boot.img substitution to the build_mixed script."