Merge "Remove the module-lib-api target"