[automerger skipped] Merge "Add module-defined APIs to module-(app|lib)" am: 1f7d037f0d am: 6f89920b8a am: 32a29b3092 -s ours
am skip reason: Change-Id Ia0a48b9f6e45fccbe67b369b61660d88b5000a44 with SHA-1 970c053315 is in history

Change-Id: I844e86ccca36f9d62f31c69bd50b98ee957f0022