Partial refactoring and Android-type style changes.

Bug: 18581716
Change-Id: I85aec575a318861468ea4707b70ed747c27293c7
2 files changed
tree: c4e8b58c0bae9dfc041e7fa0d58640bb6a0dc897
  1. client/
  2. include/
  3. server/
  4. Android.mk