cleanup code templates

Change-Id: Id487d83c4efe0bc251845af54a44d8bf19898a0f
fix groupId for dependent libraries

Change-Id: I502b1eba3a015329469cebd3ca7a856569c71050
Merge "fix groupId for dependent libraries" into github
Merge remote-tracking branch 'origin/github' into gmaster