Merge "Partial refactoring and Android-type style changes." into mnc-dev
tree: 3f14c8e763840a17c1cafbcc49a4894a34c6606f
  1. client/
  2. include/
  3. server/
  4. Android.mk