Merge "Add module_lib and system-server artifacts to sdk dist" am: 96bc306bdb

Change-Id: Ief282bd4899698d920f913de0f2d4bdd3d302163