Merge changes I051d9130,Ibf3c7635 into gingerbread

* changes:
  add missing fields to AndroidManifest.xml
  update assets
tree: 576225fa174a111a31cf869f417798013c3ccf11
  1. accessorychat/
  2. demokit/
  3. labyrinth/
  4. Android.mk