merge from donut
tree: 848872949903235eaeb66ce47a3ba8ea46dacc24
  1. Android.mk
  2. client.jar