Merge "Add module_lib and system-server artifacts to sdk dist"