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

Change-Id: I998af1226dcf2a19a418e29147568170d079fee4