Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.013 on remote branch

Change-Id: I243783c211b750a67fc06f22fa9e80742e28017c
tree: 34261d409f230999678e0871479bc84b4d14f518
  1. client/
  2. include/
  3. server/
  4. Android.mk