Changes required for building GoogleCamera.

Change-Id: I2ea7f4714e3003ff05eadb6cb8b93af721b39ac6
2 files changed