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

Change-Id: Iaf5ea3e651e025701a8cedf091c18d4130f97947