Use ADD_LIBRARY(... STATIC ...) rather than ADD_CONVENIENCE_LIBRARY for
libraries that will not be used for merging.

This is a preparatory patch for later cleanups of cmake code for merging
"convenience" libraries.

Change-Id: I55188a81471c3a8eacb92a464faa60b071933cba