Merge "BuildBootImage: Add secondstage image support"