Update the list of C files to compile, re-add whole_static_libs and
modify the names of the referenced C libraries.

Test: builds
Change-Id: I08031cd029d33f52d101d07a2fbbc0c3709a7819