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

Change-Id: I1aad4f8b17853308346d62cf70a54d6503ba9675