Merge "Revert "Add soong_javac_filter to all javac commands"" am: 6dd4debe74
am: cb78c50239

Change-Id: I2a85d1855e4a013e6438a0b2ce5b0cf29aa6c3d6