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