Merge "Add phony target javac-check." am: 49b524c
am: f3920d0

* commit 'f3920d0aacd60ceeb3fa62331869272ecfa6bd1b':
  Add phony target javac-check.