Merge "Make package_native_serice an (ephemeral_)?app_api_service."