Elmyra: cleanup here and there

Will this ever finish?

Change-Id: I1d26d88000c59ea48f4d8e8534282b3ada9664cd
10 files changed
tree: 42d481e0d2c023aca1612e9deb5f4c26c0a212ea
  1. res/
  2. src/
  3. .gitreview
  4. GoogleManifest.xml