Merge "Remove unused getAuthType method from InitHttpd" into stable-2.6