Merge "Switch some build tools to Soong"