[automerger skipped] apex respects stem of java_library modules am: ed50ca8d...
[automerger skipped] apex respects stem of java_library modules am: ed50ca8d -s ours am: cf464be3 -s ours
am skip reason: Change-Id Iaf5023020b5440f1ffd4f5414b5a7864655fc22a with SHA-1 ed50ca8d is in history
Change-Id: Id93210f7a9cbf1e54c789b165148eec2db9ee5ea