Merge "netd: Switch throttling to use HTB instead of CBQ" into froyo