Merge "Switch to soong_ui to dump make vars"