Merge "Allow java source in LOCAL_GENERATED_SOURCE"