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

Change-Id: I04778ea93eabdbc0594e0bce0ebd2b8a5ab7d02a