Fix several minor errors in the build configuration.

Change-Id: I3445c97e96b8e59bd6b954dbf9ffdd2ceffd05eb
5 files changed