Merge "Simplify Soong bootstrapping"
am: 2e5dc07c1f

Change-Id: I90835790fe8a2b6d526a8c345638c8380972beaa