[automerger skipped] Merge "Add module_lib and system-server artifacts to sdk dist" am: 96bc306bdb am: 59f8d20e9e -s ours

am skip reason: Change-Id Icd91da0976f24eb1b4ea1eeaebb96398990f760e with SHA-1 b4aca10721 is in history

Change-Id: I49ece3b697d83a60e3360cbacf67440e27d77ce1