To make it more flexible. Also cross-test with library-template (build) since it is now possible to do so. Change-Id: I137013dc6bba01ef9a20f3f86cb4e4ced014421e