Merge "Separate modules for API docs and API stubs"
am: adf0109da2

Change-Id: I778d4736dd73e1a4955f8cbab316b8d60f44f9a2