[automerger skipped] Merge "Compose the main stubs jars from module stubs" into rvc-dev am: d8d0efefe7 -s ours
am skip reason: Change-Id I255486112c03f237aa342cfb93f3b473a2f50470 with SHA-1 33ea999720 is in history
Change-Id: Ieb173cee9f51578827f1997c30b66271d529c175
This commit is contained in: