merge from donut
tree: a916e93b900dff0d54381c98f8590de3e8a2dfa2
  1. Android.mk
  2. googleclient-lib.jar