Merge branch 'stable-2.13'

* stable-2.13:
  Fix buck build, remove java_test.source_under_test

Change-Id: I461e38b772629d93c3c89edc905cd32198724112