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

Change-Id: I1ab5a9cba0d7b8a54d722b698ced0dbfdd4ead54