Merge changes I7e8fcd2e,Ie12d743c

* changes:
  Add soong_javac_filter to all javac commands
  Re-enable dx support