[automerger skipped] Merge "Separate modules for API docs and API stubs" am: adf0109da2 am: 1ab2a87a59 am: f67e03b7a8 -s ours
am skip reason: Change-Id I285e8c82078d5bd3ed85b0343db2f6375ce7ffb7 with SHA-1 0d7e86d03c is in history

Change-Id: Ie3bee527cbf44882405d50da467ff19cc3e8ecbd