fix build - quick merge

Change-Id: I728a92c0422999e3c4df3ceece0cbeb66ec404c9
tree: f3e25c0bc1f9eb1e37200f0215571d44d8cf90b8
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml