[automerger skipped] java_sdk_library: Extract common stubs redirect code am:...
[automerger skipped] java_sdk_library: Extract common stubs redirect code am: f97ca37f -s ours am: 0a14be9f -s ours
am skip reason: Change-Id I53e41a18792488aefd6a886c587559e90b3c4fde with SHA-1 b05d4295 is in history
Change-Id: I212f6397b9f6b7ee7f7f95d40ec4242612f178cd