Merge "Add more of the bionic architecture logic" into master-soong