Fix Build errors.
Merge left out source files.

Change-Id: Ib3fdaa0c270958c37917d5f76840261c9a5f537e