Merge "Import module-lib and system-server api files too" am: 97b07b7a9b

Change-Id: I61307528b965666ea54192dcc55e9b6761345821