Add support for builder Groovy and System Groovy

Closes-Bug: #1251869
Change-Id: Ibc49e1aca7b33eb9c0c21472a924cb375069ee51