Merge "Add module-defined APIs to module-(app|lib)"