Import module-lib and system-server api files too am: aa554c0b63 am: 94e03c4466 am: 77ebf7eee3 am: 1c0960374b

Change-Id: I4408ea46d73723735a3c090db031985dd38504ef