[automerger skipped] Merge "Add API stubs for module APIs" am: f828b6c71d am: dde14cafd7 am: 01b172c051 -s ours
am skip reason: Change-Id I0254a5f7751c58029fa7a8d5c342b731a7deb69a with SHA-1 e309516406 is in history

Change-Id: I05720a1f91ae01b6cafac8a48f66f291dc5ad279