[automerger skipped] DO NOT MERGE Make Cluster configurable to use Navigation only. am: f7597f91fa -s ours
am: 2e186409ae

Change-Id: Icada7db71396d30fa2c07bb09852f9b0cd6cea0d
tree: 762ad95e62cc81afc104d47aa4bb9daa6d6b61cd
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml