Merge "Define sane default target SDK for system_server."