Merge "Simplify Soong bootstrapping"