merge: "su: Update for latest su daemon compatibility"
merge "Clean up c formatting - 1"