Merge "Update for Soong-only makefiles."