Merge "Add boot.img substitution to the build_mixed script."
am: 53ef2285f0

Change-Id: I55936a6045b979092c81cfd5836b13c191d0ed0a