Fixing generateLinks and java docs

Also fixed import order

Test: Ran framework core tests
Change-Id: I8e99cfc8bab8f7c9f18310634c9565200df43e7f
2 files changed