Merge "Simplify Soong bootstrapping" am: 2e5dc07c1f
am: 67dc1c2e4c

Change-Id: I9ba778c1d632e7659cf2343078bb6778a31ad13f