Small fixes for non-Eclipse generation.

Change-Id: I8001a2ae68106770f25ac816f03fa0c0a9420cb8
20 files changed