Merge "Set JAVAC_WRAPPER if USE_GOMA is set." am: aa09aa819f am: cc2ca23b1e am: 7b691489a8
am: 1cceaef3fc

Change-Id: I10cd3937cd0b6d6810d9795323ff42641cfaf880