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

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