Merge "Switch to microdroid variants of first and second stage init"