[automerger skipped] Merge "Compose the main stubs jars from module stubs"...
[automerger skipped] Merge "Compose the main stubs jars from module stubs" into rvc-dev am: d8d0efef am: 0c025742 -s ours
am skip reason: Change-Id I255486112c03f237aa342cfb93f3b473a2f50470 with SHA-1 33ea9997 is in history
Change-Id: I0ec75ee6739201ebca48492a5aa27055273c747d