Don't use @include as that supresses useful error output

Change-Id: Iafcc7c188841d2710f0eea925a901dd59aac813a
Merge "Don't use @include as that supresses useful error output"