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

Change-Id: I71093c51c1767140c1f93ca6d6730ddd465f3757