Merge "Add script to create a Mixed Build"
am: 7690c7f71e

Change-Id: Ia3e3455368e3836fb6a2b3341a62532655499dc0