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

Change-Id: I3080c4b0cce92695e21cfa16d634135b9cfbac08