am 0b9e2abf: (-s ours) am 40f6fb41: am b622b867: Merge "Use raw types with JavaVisitor#applicableSuperClasses" into studio-1.4-dev automerge: b02d06f automerge: 1c584f9

* commit '0b9e2abf278ef2bbf341aaf5195c8bcf41372e9a':