[automerger skipped] java_sdk_library: Allow separate api/stubs source modules...
[automerger skipped] java_sdk_library: Allow separate api/stubs source modules am: a377e4c8 -s ours
am skip reason: Change-Id Iea7d59852d7aeb503120acf3c44e08eb0d9d07b9 with SHA-1 0ff08bdb is in history
Change-Id: Ieaeaff0b5562874ba3683c461e4da14f47e7cec9