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

Change-Id: I59c6ff7c06ddd0c8e6abb590055d71839a555aba