am f34e4d5e: Changes towards getting the app compiled using the SDK.

Merge commit 'f34e4d5ec99fd7883bbfcdc0f644d9d6e4df6c97'

* commit 'f34e4d5ec99fd7883bbfcdc0f644d9d6e4df6c97':
  Changes towards getting the app compiled using the SDK.
tree: 18d924146c14bee1026f10723321815281872406
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml