Fix javadoc and sources generation

Change-Id: I4a5f47d45e452d2e6fb3b2fae578f8e9e988841b