Merge "Add module-defined APIs to module-(app|lib)" am: 1f7d037f0d

Change-Id: I4138cafbdfd143f22e9a78890f57c7e3c48f88dd