Merge "Fix genantlr() to support buck caching"