Merge "Migrate su to Soong with xbin"