Merge "Make SOONG_JAVAC_WRAPPER use JAVAC_WRAPPER to call javac."
am: 51e7a0cca4

Change-Id: I2c311aa5442b26c046173be66ade18a73913673d